fix build failure

Change-Id: I104d6b1f74d4bc712a6285f0a105c6a67d8509b1
Merge branch 'master' into aap_code