Merge SP1A.201207.001
Change-Id: I88207ac8c6a1e393256615fe3aea27d088ce2183