Merge 5f4172edcd333fedba420136bacb6fd1aed8e233 on remote branch

Change-Id: If07ed0da36350ab44fc51e1c9c9bc4daa16e0794