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

Change-Id: I542fcb67e5a7aaef0f976d652a42902b0ff521cb