Reconcile stuffs

Change-Id: Ib3e7835a4cdcf597b8d8776c2eea6470114887b7