Merge bac7cebe705bdc1f7a639be15ab0979eda03d2d4 on remote branch

Change-Id: I4f54150048bf4da4c58d35b42af6900949a8d753