Change-Id: I3d78f0517f7eeafc58ec5b0edfc6a04901ad48b2 (cherry picked from commit 35229ceb772a4a3c0a9dbfcb42fdb45344a91b4e)