Merge 77d16aceae884db5382a203e538827e6ee205051 on remote branch

Change-Id: I27ea330b493e4ab4c8d5b2e78c2d3d8d4f220150