Merge ad4f084a067e72ec6635135eea40bf17a79f7b68 on remote branch

Change-Id: I9e25d75304018e5e4aaacd85894e175c8271c281