Merge SP1A.201207.001
Change-Id: Ib5a1e84728f955495408f81cfccd9e5c66c18c21