Merge acd3e67a8c6e6202f43b1a5cfe72d9fdbc9c7184 on remote branch

Change-Id: Ieab1d8d83c3e042db1403ef9543534d619a75ce5