Bug: 164398026, 177355163 Test: manual test and unit test Change-Id: I36ad3ed3f87f0f1129367eb3e4f02f01ecc7d502
1920a823cc
9c85831108