Merge ceb12448a1f3ef7da7f2453d97bcd80a8b33663b on remote branch

Change-Id: If1c185be892b494effd8dd44a3ed7dd567415b82