Merge 8217d7a17adec428ce8d834a02057ff026922e21 on remote branch

Change-Id: Ia76cf14c23c4a8310d5308155908df98fcae211e