Merge SP1A.200727.001

Change-Id: If2b5054816bce2c5314fa62294cc8043a5c7e203