Merge "Change dependency library"
am: c8a68d9aaa

Change-Id: I9eda56e6cfb3f34f1c9ef5633aebffb4ebd1ca16