am: 16a91ffd * commit '16a91ffd': Fixes redundant dependencies and .gitignore issue. Change-Id: I75dbd1e55281f668baab3667cb8f3f0d1c127085