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

Change-Id: I48e448e005d6164001da0a710d26156cf17956d6