Merge 0a072fd45117d8d7cfa1a14cbd5bdc5e78afb9be on remote branch

Change-Id: Ie325f6aa78161a6da7bc7dee2ef9eca0e7fb226d