Merge SP1A.201105.002
Change-Id: I3f78576dbdcfeb2c18ef633222ea23a3cb288814