Merge SP1A.201116.001

Change-Id: I02055c2bc80be7265907733ac91d2153285087ba