Merge SP1A.201116.001
Change-Id: I17298f7137b3c4340c14e81c81e86edd285e5fdf