Merge ee47953081926b12b18d1e610eb4950c9b4b31f9 on remote branch

Change-Id: I5924d4a3ab01522753f13bb89ad5f468e1841bf5