Merge 8b2908411027a9f319541e62019a99216adc8783 on remote branch

Change-Id: I0faf41502b3359cb86e7eddeaa6f66dcb53ec4b7