Merge "Change dependency library" am: c8a68d9aaa am: aecafde35a
am: a32a95adac

Change-Id: Ibbe699b9d5a611b56a79b1defff13ae95d5cea05