merge from open-source master
The Android Open Source Project authored
Change-Id: I33605ebb36f1978e1c4715f6688074c808981c8d
28739a81