Merge 2745d13bb8ec88dad5e73a5649d98eb4728b3cce on remote branch

Change-Id: Icef295cd325199435aa5d9621c4aec108fee5557