Bug: 0 Test: none Change-Id: I4209fc5149dcce6bf75aef130afc69c4600c7f3b Merged-In: I4209fc5149dcce6bf75aef130afc69c4600c7f3b (cherry picked from commit b83929c9)