Merge bba5f121d734a6c3f5bb25bba6b9bc93fcdf465d on remote branch

Change-Id: I0a2fdbdc3ff8bccfc8b06568b850ae2cd7012ecf