Merge changes from topic "null_callback" am: 5ce391b313
am: 54e83aca93

Change-Id: Ib8ddbf5f5e6b1b22bd7e6e6ee311153f332a5320