Update API for this and the previous commit. Change-Id: I19275a5d00081bd0f00afea59a2b673344a32954
4deb52f3
20777fae
584bce31