Fixing build breakage
am: 7267adf68e

* commit '7267adf68eb582ff20e2ce1bfb2068caecc4e3f5':
  Fixing build breakage

Change-Id: I558760d325a96cea3e51a054d7b866ba9036ea9c