Change-Id: I949fe4bd99d2a4471fef3e3967980a6163943e71
- PS2: generic xml instead android xml - PS3: formatting Change-Id: I4c552e172d670278ab2bad1897ceb89b7ee7fec2