Bug: b/28974522 Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a (cherry picked from commit 383db5eb)