Change-Id: Ia7ceeabd82046645ddeaf487c763288f36cfbdee (cherry picked from commit e0cfb0a31a1c6ad0f9dcf0705b44229593a0915f)