Merge SP1A.201207.001
Change-Id: I319f5688f6f2d2b049c05314fbfb2d7f2fd8b108