am c09e123c: (-s ours) am 4a5fbd14: am bc0dec1c: Merge "Fixing NPE when getting extra package display name" into studio-1.4-dev automerge: cdfb324 automerge: 19daa38

* commit 'c09e123ca2f5ef7891f6da33ba0ba2d66006be1a':