Bug: 22322814 Test: none Change-Id: I1d6cf89e0b171a6029d7e9ee60bac4d8ee61cdcf Merged-In: 14647a3e (cherry picked from commit 14647a3e)