Merge SP1A.201207.001
Change-Id: I01824fcdedff251601da6dead172af24c80cefc5