Merge remote-tracking branch 'origin/upstream-devsite-with-java-layout-html'
am: 244f97fc9e

Change-Id: Iaab40cb42c164a938b2ccd3866452c9e3a9f98a2