Test: atest Bug: 155251236 Change-Id: I190a03385b9136748aa75dbd26ed4556cf81599a (cherry picked from commit 858b4ae2)