Bring up to 4.3

This depends on crespo 4.3 bring up.

Change-Id: Id46eaca690f5f2ad7ea99d61b75cc755681547dc