Merge from t0lte

Change-Id: I9a621b11c03577939104b0067cdd0b3b7afdc5a5