Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev am: 259dd151f4
am: 5ea38d0493

Change-Id: I02770c481e6a0df7bc17f17ffe7e094e82b4aaca