Merge SP1A.201105.002
Change-Id: I8aaa41d26c347d0549a5dc8298c4be9a35993e43