Merge 0c0400284fbf8cac494687d733b6d503eba92744 on remote branch

Change-Id: I4fe971cc53bde4dec467f939aa5954403d1df324