Merge 20f65749785921fcf3b9859075098c64e3934221 on remote branch

Change-Id: I9b8ba772933177f98004f1b865bf19610f00b955