Merge b9e509cba1691d24d8cc06625eff4e1ee25eee51 on remote branch

Change-Id: I94f8c8d863c85ecc86a0f9051af4660119cc3174