Merge SP1A.201207.001
Change-Id: If07e45ef9dac1ffa7bf98aea68fde4be9b02949a