Merge "Rename getIntent() to getRenderIntent()" into oc-dev am: b2bb3bf268
am: 98e11587f2

Change-Id: Ic5c95f3f4f811a1f668ec6218371efd3fe169371