fix up cherry pickings

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