Merge 3396a6f869a553d801d5051ba293204e45455846 on remote branch

Change-Id: Iefec74f379d1147cea8a979e580b48088252ca18