Merge 557708ecb6b40e17f3ba87a098d0eb4c1c0c7569 on remote branch

Change-Id: Ida7b2daeb513674b50f4db8b886aed64b9b4806a