Merge 59e9ea50ee2bdcf21f38e9958f100b59152415b2 on remote branch

Change-Id: I4c6542430d145e6b1be90682084566cfa95a9ba1