Merge SP1A.201105.002
Change-Id: I0433257696d7120901bcf47a140ae898ac87ad93