Merge commit 'b199063637192ec215ab6a2a86922cb41ce71e96' of sso://googleplex-android/platform/art into HEAD
Change-Id: I4a575a6971b3b5d24a3d4780257311b3e866523d