Test: none Bug: 190093578 Change-Id: Id83d1ff6bbec63ec94402260a29c3ddcbf0ae414 (cherry picked from commit 273227d1)