Merge commit 'bacdb919' into master

Change-Id: I9acb70c07d6dcd20bd571810800a8c714c42cb64