Merge commit '4cd68a39efe4b6f17a1a4132dd23a8b05863382b' into HEAD

Bug: 131249906
Test: None
Change-Id: I42ccc29dd05218e291a6cda3296cead52f9a7ff3