Merge 05428b787e28e6c5bcf4a4477e8922373e0be23e on remote branch

Change-Id: I78187ded182ae51f826c098b28b144d233329eb9