Merge "Add librank2" am: 713398f8bf am: 679c728752
am: e430d45a5a

Change-Id: I7abece97766ae05a8d8aeb16ca5dbdc840235ddc