Merge 24fddae82ee21d9502462f63df53b68aeb5a6fac on remote branch

Change-Id: I0b283f439254fd5990cd506cc13c9f9985065a7f