Merge commit '7bef3f3e543161c8359c37a07035c7d517bd1819' into manual_merge_7bef3f3e543161c8359c37a07035c7d517bd1819

Change-Id: Ifbe3974f5070764980de5469d8c209fc73ac3001