Change-Id: I76b2dc05aadb1773a87efaee64bc1184a1246521 (cherry picked from commit 94576895f7553462ef75ca6923609b114a435417)