Merge 65412a4addd1d1ab5f6e80bd690bb69048ac3108 on remote branch

Change-Id: I4dd1251e6fef417a60efbec5ff864e173d4fbf50