Bug: 137202333 Test: Build Merged-In: I1c0cb7840cb7d68fd720723eec96aa51aefc1df8 Change-Id: I1c0cb7840cb7d68fd720723eec96aa51aefc1df8 (cherry picked from commit 4b5f423c)