Merge 3e44c3701d2bfbfd1923f7b32fde470ce21e31fd on remote branch

Change-Id: Ie4da4c2dcc8b77ab66efbf5185f5e594c256d1a1