Merge "Merge "Minor cleanups and fixes for ActionIntentCreator" into udc-qpr-dev am: 62e6b210b4" into udc-qpr-dev-plus-aosp