Change-Id: I6bb7be6df8be3dced903f72cef4600532cb118a3 (cherry picked from commit 10e606aab45365b15f2533e0e92d5047ac6a84fe)