Merge SP1A.201116.001
Change-Id: Ib3f4f7e3486d0ab8359052d9f035ba634f6fd49c