Merge "Update nullability of api"
am: 47890345d0

Change-Id: Ie8ed183155b16c87a98c19f11f69fe869e797880