Merge 3396a6f869a553d801d5051ba293204e45455846 on remote branch

Change-Id: Idbb63bd15b50245cc578e93e8c97817c4006bcc0