Merge 56b84a2f7091dc588c1bc2045cf394267d19fe08 on remote branch

Change-Id: I859236573014e781ca5bad8746cf08a9ba005032