Bug: 63584589 Test: None Change-Id: Iad6941df5a357e3a1471d446e9776d8412d9e215 (cherry picked from commit b1dc6ca8)