Merge changes from topic "null_callback"
am: 5ce391b313

Change-Id: I0a956cd8b88d956102e912b5567732341faa78fc