Merge SP1A.201105.002
Change-Id: I7ed4f05745ecce0537536646332b70bdff7e3aaa