Merge commit 'ebbab5196ab1c9dfeb610f6847650da181268e59' into HEAD

Change-Id: I4589911438030283a85737073c0c4eeb2fd875a9