Merge SP1A.201105.002
Change-Id: I715e9caf39294aadb15dc3cfca93e606e5b07194