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

Change-Id: I20d65e7124a41d3aa99ecfe0eb70af2ee45680fb