Merge SP1A.201116.001
Change-Id: Ia4f0af6102c46f9635bcdb028b80586e4a3e4c98