Merge SP1A.201105.002
Change-Id: I601cab646cdd234f236e0daec10fa1ed919ace9c