Merge SP1A.201015.001
Change-Id: I311fdd060dc3b17dad89fe1248a0acd25cf756d5