Change-Id: Ia96e6c1feb612b70e518c12722cd5e169bf142ac Former-commit-id: f6437fdb1bae6439481c01042cb74c885ba0768a
Amend: fixing code per review comments Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627 Former-commit-id: f3d38c3b1ea1b8118f90ce38937a689a9581b2bb