Bug: 37579161 Test: Build Change-Id: I609826de47dc3fae4dee89d43951269a462c22b2 (cherry picked from commit d97c30af) Merged-in: I609826de47dc3fae4dee89d43951269a462c22b2