Merge "Revert "Update for 1.0.0-beta1"" into pi-dev am: 767743d64d
am: 5853856ead

Change-Id: I7615fbcdaf6f77385e487fd92cf51dd3a10ed9ad