Merge 49d197462079a7ea1faaf10b693bf75880cf5695 on remote branch

Change-Id: I1f9ef4d9694232bece4ffb50ab1a96b9caa6d0f4