Merge ff0735c1e6dece3d5970e066be7ef21b983dc704 on remote branch

Change-Id: Ic23a079ebae607e1c0eeac1885e555ecff4408be