Merge b217b0342962100d80ac5e44a7049fbfeefa06f1 on remote branch

Change-Id: Ifd094c5bbe22d9a45ca26aa30d88929fd500aa86