Merge "AdapterProperties: Crash on invalid state transition"
am: b1ae4411c0

Change-Id: I46d151e5df6cdce375abd4461a5cbd8dedf7fca6