Merge SP1A.201015.001
Change-Id: Ia12321c8a4dc1e29208c13932147a58e30872a50