Merge 5422ad0e84b2417f5f6340420adce565c40ad48a on remote branch

Change-Id: Ife829d07c25881366d09bf3d0e6b207a2504045b