Merge branch 'rc22' into merge_rc22

Change-Id: Ief83e5c1e202a74cf633a8c774df5ae6978a2767