Merge "Remove redundant dependencies" am: c0a1cdc42b
am: 03a732f115

Change-Id: I54548eea7810d33a8213fe68e050e65c6d10c824