Merge SP1A.201105.002
Change-Id: I6c7ee8eb050879e8b2bdf2fb7af0924b248b93f0