Merge ed059319474231351ed46c695e994484cbe423e6 on remote branch

Change-Id: I4b41f22f18e038af7e6d2c7f913e0d9e2ef279d4