Merge 261070934c29c7ab8bd4240b4dfdc917e4e87325 on remote branch

Change-Id: I595b968d8002a3a639c6d145a99d4915683d7755