minor corrections and import for 4.3

Change-Id: I5f5a42c562d0ac2874ec5cd3ab483e190c3ab05d