incorporated review comments

Change-Id: Ieef359e39b394e0fad44153c06e2688363870657