Fix build am: 005055c070
am: 655c5066c7

Change-Id: Ibe49185028e33b0553928347b1d546404f09063f