Merge f0112a9b4c0f58e62da154e7f1f50bf7a5e00d64 on remote branch

Change-Id: Ide283a8f824ff258977c8ffd0006001433dedda5