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

Change-Id: I18b9d188cd89c533bcd43588265dbc19ad6ff35d