Merge 1acdc785b7d7f583465a50b8ce30390e282bf9c2 on remote branch

Change-Id: Iae47418fec43252cc4ee5d608d0d42827cca2476