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

Change-Id: I34f3f9ed33bbf889ae654846ead71b491719b408