Merge "Update Adapter State after native layer complete"
am: a4f716556b

Change-Id: I50dd8539914634eac8f9b8ebc0be2ee25d7bd441