Merge "minor change to keep it building" am: 73cab34d9f am: 91c7bc3bd6 am: 6d2483e7d8

Change-Id: I5fc3686a1457001fe1c9662dd550d0289d4c3435