Merge c7c7b49bc150b4a18b970d6b783c9eccab5e889f on remote branch

Change-Id: I9ea408a0644e1971fe13359ae14c5d813e7c91d3