Merge SP1A.201207.001
Change-Id: I296316cbad0201e1f5e542ee068c1fc8e09d7d5c