Bug: 36232423 Test: mma Merged-In: Ica752e24e78e84350e13c66a2a0a56092f232d0b Change-Id: Ica752e24e78e84350e13c66a2a0a56092f232d0b (cherry picked from commit b75539b3)