Open up master for development

Change-Id: I90b7a74bb4caa6f9e324b68a486f6f39a8c244b2
Merge "Open up master for development"