Merge commit 'dd2d8e27d8548893122c469bd1b68d5117fc5318' into manual_merge_dd2d8e2

Change-Id: I438cc9613c527bd0ca14caa8a08dbff6a7c0aa9d