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

Change-Id: Ib65275730186d8b6dd64679ea96cf4f10d7ecdfd