Merge "Match upstream file structure"
am: 5d9cc8c989

Change-Id: I3b544565dfe8750cda1b1b10c2231dda02f54470