Minor tweaks to consolidate with internal repo

Change-Id: Ibd7b6e1605235ffd4e858ee108a1748748261682