Merge 44e5da4d616549f8d3a5243e7666b58fc86aa14b on remote branch

Change-Id: I4b183839fca3e900b828301484fc08d190072654