Merge SP1A.201105.002
Change-Id: I18cc1b793b1e54b45cc370dce082b01b2262d555