Merge 3427fa714e56fb8e47332fb225a8c30764060586 on remote branch

Change-Id: Icaa3b2f2adbfc3965728b72bbf33fb9b125eddcf