myfirst gerrit code review changes

Change-Id: I10144e25ad8d486c80c8fd6e610fde8159d3f5c9