Update to R05 Beta

Change-Id: I31723ff432c2f98c0e96c0bc24af40f2c82c1358