Merge SP1A.201207.001
Change-Id: I74568300c3aeb8fb25d611327635b1ac2cf457c5