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

Change-Id: Ib4f853674ae97e7d7b4e3cef05e2668ef514e045