Merge "Added nullability annotations to API" into pi-dev am: 66b90a035f
am: 0bc1a4fab7

Change-Id: I5d1c67b2592bc5847059fac8e9ff2a8282f7acb3