Merge 80228a1ee7d8b3c200c5ab639fb001ffdc30f7e5 on remote branch

Change-Id: I945f92d3d0464cd1f5e0ac769ca88516603aca70