Fix the broken build: git_master/apps am: edc9c8d3e1 am: f087e881a1 am: 8bccbfb84a
am: 9b17f9b336

Change-Id: I9ceef83b50f83a27c9631bde15da42c415766b11