Merge aaf2e765 from open-source master

Change-Id: I523c3e7def1d8dc1c9fa9308143bee952e73eeb9