Up most Note2 dependencies

Change-Id: I2e28d448a4de9eb42643e73780c557fea652f8db