Merge SP1A.201207.001
Change-Id: Idacd45a3347533846a2972a0afc71ecee89300d8