Bug: 32101881 Change-Id: I45a806a6b1fc387b2c560a8f2228ad83e4068d7c (cherry picked from commit 7e09146f)