Merge ff94fe370a57e7952fdca0b3efc7a9acb11b5718 on remote branch

Change-Id: Iaef1e10becac2a1b23678071d48c4dfb32887256