Merge 322ec94ce05c4271cea08e20e5129f2ea86812ca on remote branch

Change-Id: Ic98e6d87ded26c37457248f814e214d9067a286f