Merge "Add two more camera APIs to light grey." into pi-dev am: 3ffdfbfbc0
am: 10d8a70155

Change-Id: I8ca751a3b24f35197024b56f2ab19dac942bded1