Merge SP1A.201207.001
Change-Id: Ia2caf75193e7f6b5e91ac33b710d3672ff758de5