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

Change-Id: I828c89407406f0e7209979e41060e3eeb58eae2f