Merge SP1A.201207.001
Change-Id: I2db2696cfb3a0cf600268d39d9f4f9127d85a9b3