Merge f778c5f57a45e9deac7253a9c8d5ed67acbf96e4 on remote branch

Change-Id: Id8b6f836be2001c15c043bf2931b4f304300dc15