Bug: 135998869 Test: this Change-Id: I1ca9ecff8ed93164855686e4c76a070e6fa757c7 Merged-In: I339c62f0ce68cc3c19abbaef7f99d216362db4cb (cherry picked from commit 8fba41c86d92460a80cd58beb131528ce6e147d8, aosp/1188840)