Merge 54b66397dc72ffe159846f5602b69aa57ca6b011 on remote branch

Change-Id: I488abe80c0af72fff9e9b9e2cbb71f864b1ac14d