Merge 6879d90872f8d5806bd01e649e87d26ee50e788a on remote branch

Change-Id: I400c38595f1427fc973654bbc83c2d65200e2998