Merge branch 'master' into HEAD

Initialize the "master" branch.

Change-Id: Ifbc2392b088588494a65252a61b902bd61479144