Merge SP1A.201116.001
Change-Id: I39014e219c30c0e2533bbc2403507177e7fb0eb6