Merge "Shorter bucket elevation for system_interaction and sync_adapter" into pi-dev
am: 461a71a5fa

Change-Id: I8ff0e9fd5f73dbce2709381207222d8fa673418a