Merge 376b786c922520ea4070f5318b5e49351d54b73d on remote branch

Change-Id: If71bb448904be19b3fefd4681b2d9d7d36138387