Merge 5878e48c3202d2dccc51150be134a8ac3d5558f1 on remote branch

Change-Id: Id9b8b7672b689ecce37ee17eb990265687b32f0d