Merge to upstream r350972.
am: e4b6d367d4

Change-Id: I5d25f3049e395f1b66829140a87e6c94f68f5703