Common edits

Change-Id: Ie9dae90b8398e91311871b2a9b2467214762b7fd