Merge 32f3dc7ca8f4d76aac78c27fa8398becd8831f21 on remote branch

Change-Id: I48f714a9d104d924688a4a56d3023bcd476d8572