Merge d9d5fdb1d9f7b7c1149db192a9dbe7de785a4f45 on remote branch

Change-Id: Ia13cb806f386d98666f0d51451d72cdecd34ca14