Merge a707529d06dfad940339571d871522da3b4de186 on remote branch

Change-Id: I0711977ee5fcb5ea0bb8de419f84d7f21d2fbb1f