updates from @mikeNG

Change-Id: Id90161cd40b5ef9ba44c9f765c03cffe1a492ea6