Merge 17d8aacf382e300a30e5ed27a270809783ae8fb1 on remote branch

Change-Id: Ib4dc7b550bc974ba896db619d9d99f5b76c65580