am b490d5d3: am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001

* commit 'b490d5d3ece9b0617feacd71e4b2a85a0e1b26a8':
  Fix BridgeContext.get*ResourceValue()