Merge SP1A.201105.002
Change-Id: If62212e06253730e807dc86b574c44c4ddb28fdb