Merge commit '8b1c13424270cbe4f0b6bc426f0ff80888b87114' into manual_merge_8b1c13424270cbe4f0b6bc426f0ff80888b87114

Change-Id: I5e5abed96805f7037d32fdbab300b222c47b0039