Merge SP1A.201015.001
Change-Id: Iec88bcfc2620edc8d94895e598546bef08508abb