Merge 7d333fb9415ce10a293010fe32ffed7430f69396 on remote branch

Change-Id: I530a92df7b8bedc3be4a93325cb1ea12b20015b8
tree: 79bcba375cb26075abc393e23781439ec6dd468e
  1. 1.2/
  2. 2.0/
  3. prop_pickup.bp