Merge b9abda3015969430b55b7b84021a36178a116376 on remote branch

Change-Id: Ife940b2205069f080bd908e948a3ba7fac592009