addressing reinaldo's comments

Change-Id: I30cb69404dd55730b65205783acd5a93ee68b985
Signed-off-by: Paul Quinn <paulq@cisco.com>
Merge "addressing reinaldo's comments"