Merge "Match upstream file structure" am: 5d9cc8c989 am: b5937e4be3
am: 11a97a2ff7

Change-Id: Ic6f19947a26f73d271baade0e05a356d191b8b09