Merge SP1A.201015.001
Change-Id: Ifbc521f3bed8b4d7ece798b96c8826e16e2b7d76