Merge 2517c1eb152207d2b5ad9792438e59a280533171 on remote branch

Change-Id: I93276f0392e2604e28d57a9804403267c0d0f5b1