fixup from merge and picks

Change-Id: I73045c492207e67e6130df8777eabd75c8b19b75
Signed-off-by: scott <scott@ubuntu>