Updates to address review comments. WIP commit. Not tested

Change-Id: I9af318c024fe72703a5dc1cc6804376d67bff665