Merge e4f0016ef9713b299305a1f0edef1132bcabb7f5 on remote branch

Change-Id: Iea3ec920a01cfdbec95c831bcb8571d011a998b8