Merge "Merge "Oops, wrong package name." into rvc-dev am: 5d6db1b9ff am: c716d46e71" into rvc-d1-dev-plus-aosp am: 8d26c691ae am: c015cb288e

Change-Id: Ica56aab59dd2b76c03a8390525c4b8e86e6952d5