merge 4.3

Change-Id: I5413de1dc4c582f4005c326f774567317297df90