Merge c017f0ed6019257c611216ece298394110029f3c on remote branch

Change-Id: I8867dedaa92ac01e34b6141ec9aaac21e4f7ad1c