Merge SP1A.201207.001
Change-Id: I601c0ce8f660465cc25f4845b72b408b4df731dd