Merge commit 'd0b4295c' into manualmerge

Change-Id: I6d7178edebf50663fa9622b539c8101627a84385