Merge 5c9891b7caab81129d937b1b280d50c5b516f962 on remote branch

Change-Id: Ifab6c01302556e242b070ea0843d1c6e88c2042e