Merge "Restrict pmsg use to eng builds." into nyc-dr1-dev
am: 67ea7311f0

Change-Id: I38dfcc305dd9cef7f1e78bc0f852510678fc7846