Minor updates

Change-Id: Ide380fccc661c8886c239a8f8f0e3d496d291257
3 files changed