Merge commit 'b63b57e' into mergemeister

Change-Id: I63e820e6ba1095485c3d887c559eab0dc72f7712