Merge 1ad73a9451f0732bab9932da9f98539ea87b6e08 on remote branch

Change-Id: Ide66bf27341f4d06d39c629f11a4ed3643f5a302