Merge ac378d131ef599430e78d4eb5a2d611c0c637f8c on remote branch

Change-Id: Idd00bd425a3a38eea19a3faf48304cf4015d384b