Merge fdb07e4e4cc8fc764649d79b5c0e91e3a5c17ce8 on remote branch

Change-Id: I3eddf3454c47f00efbb4c1e4f3a78e6ccf23a555