Merge b19ac5827ae725c6dde2f30f6bff1c6aa41605f9 on remote branch

Change-Id: Iea8f4992edb65e4d04828fb863f9e908d3d24909
tree: 2f0b4ae0e733255cbe73e892109369d3c2170b49
  1. 1.2/
  2. 2.0/
  3. prop_pickup.bp