Merge "fix some material deps" into pi-dev
am: 055bd11b0c

Change-Id: Idf45457373ff9793163d67ed373907c34e1fe3c1