Button state should reflect actual buttons. (DO NOT MERGE)

Bug: 4124987
Change-Id: If0585bd1432c8c61ed0c9a6a4f6de4a62e3f6e53
1 file changed