Merge 428c6bdddbe496e75a0aa242227ac2ed2ff36401 on remote branch

Change-Id: Ifffcf5db1ef87c69b313ac8e865d4f12f6ebe75b