Bug: 182313963 Test: atest Change-Id: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea (cherry picked from commit a5792f74) Merged-In: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea