Merge 05fbac2bf2a4a027e4ed3ce1595edea0fe7cdba1 on remote branch

Change-Id: Ib1c26bd408aad000959a65ff154589f94bbee20f