Merge SP1A.201105.002

Change-Id: I2e1a17105f000737ddb1489ea5c66662226dd2d8