Integrate for tickets #11989, #12018, #12030, #12031, #12032.

Change-Id: Ibeeac04c5118f6347138e86a39ec79ff334b4572
11 files changed