Merge changes from topic "vndk-sp-list-update"
am: 4c0ee1e8a0

Change-Id: I155e3e864678401e0858842b4bd3ace7600da381