Amend: fixing code per review comments Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627 Former-commit-id: f3d38c3b1ea1b8118f90ce38937a689a9581b2bb
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f