Merge aae839416906cd2330e1923d351ab5cffc9e0f15 on remote branch

Change-Id: I7eb81bbe5d6d712e7b2f829b55edf74e832e8eec