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

Change-Id: Ie95edcead9b39e399a3b3fc51f121e17bc92c5fc