Reconcile g3-common + add d850

Change-Id: I62b520b8fc98715600f673061c9cc525e38fd885