Merge commit 'b2ff415' into merge_work

Change-Id: I4f9c662112fc49e4f94315d3c69860607be3bc1e