merged unstable into aibt

Change-Id: I90809f02970fef6c82053a280df6040d89bde66f