(cherry picked from commit a02eb39b84d130e5923f72edb2abb3b21adf6fff) Change-Id: Id068928f77a6efed44da9b83ecbf547302826591