am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev * commit 'ae4cb17a': Resource resolution bug fix. [DO NOT MERGE]