Merge 517d4c2b8bc5ebb2a2075cee048dbbdd8450f86e on remote branch

Change-Id: I3fb28304951e92d474476794ee8e388b1bf86f60