Merge c72570e5dd6f462bdaaeadc364aec3bf6f6fc79b on remote branch

Change-Id: Id73ecb7758be0d32ecb25f73561d5359c99d10a1