merge corrections

found a few unmatched changes between gerrit master and local dev master

Change-Id: I13341b17fb772c2f6250c99eca63e6f991544428