Merge SP1A.201207.001
Change-Id: I4232ecfa92bde4b20744534df803d9043f9b1672