changes after review

Change-Id: Ia3446afb417f1955fe4daf068c14f5b63379ae01