Merge 4a5ea1fb104b2378e1ce98d1a8d43775bf3ffc72 on remote branch

Change-Id: I0533a0a1cf06c6be1fc293a71e38e0b83a9a69e7