Merge changes from topic "procrank-ready" am: d346349d50 am: 87b96ba92a
am: 2ca4ea3b0a

Change-Id: Ic74b6cd88d4837b49a0de83842dad7e65e2eb016