Merge changes from topic "procrank-ready"
am: d346349d50

Change-Id: I3ac4e3def81c1a1f6585ec6d2f31be182ebb7400