Updated build fingerprint

Change-Id: Ibbd91b48317b37292abb31d16d0565cad7db7159
merge previous changes

Change-Id: Ie593dbfcf8f88eaa62538b7f9cc677234b0ff4e4