Merge bc9d23d26fe9581167021334a3903718f7587c13 on remote branch

Change-Id: I40ef289eaf30a66a78b4310f473709284013edfe