am: 9a32929d * commit '9a32929d': Address API review comments. Change-Id: Ieb67cdc7846a06d84280e9ea9ca1cbe34dbff78f