Merge a586c46d56369433f68f592165f29c4956b050f4 on remote branch

Change-Id: Ibe31081a1cc007771cfb5f28a827cfe9c9b94fe2