Merge 26fae5a454fda094e79c944c43ecfc54d9a9f53d on remote branch

Change-Id: Ibce81bbf65b0ad3c1f3b1de5c03f27c08deda719