Merge commit '40336782eaa797bca3d1487784af113ba3b143ff' * commit '40336782eaa797bca3d1487784af113ba3b143ff': Add tests. internal bug id 1868702.
Merge commit '40336782eaa797bca3d1487784af113ba3b143ff' * commit '40336782eaa797bca3d1487784af113ba3b143ff': Add tests. internal bug id 1868702.