reconcile forked froyos

Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7