Merge SP1A.201116.001
Change-Id: Ia344c5f954fe4649820059750c228d7cb65bee2e