merge from t0lte

Change-Id: Ifdf6c9fb263d993f74fef1a5a2c195f901167d96