Merge 378c911e0472a2cf8eb24e0c589c6de007488990 on remote branch

Change-Id: Ic196c3fee27b0e066848f99a2ed9d47ccf2e7bf8