Merge 7caa753ae35805679ef11a8d805b71e5cf1b3475 on remote branch

Change-Id: I9980109c6948f94640e64b06b3190ea6954f5927