Bug: 174189215,177931355 Test: none Change-Id: I11c81ce4cfb0f51a2fabf92a45d8425647df2121 (cherry picked from commit 7e615a52)