Bring more in sync with Sony and clean up

Change-Id: I70171cb71c96aeb7c52af7c281038bada70fbdc4
Update fingerprint

Change-Id: I956839b52dde568b11ffb3be65c25e27ead1302f
Update Fingerprint to .230

Signed-off-by: rebelos <ks50497@gmail.com>
Change-Id: I2bf0e043d28ce4c639134a0f395d83815d7a8278