Merge dc6253a789634c0a5bad9e1387897549c305898b on remote branch

Change-Id: I6c4d7982f0a41929b4315348ee2e082c992ab116