Sync master branch changes into  debian branch

BUG=b:173260779

Change-Id: I2642087c7a889d7881eabee35ff2ef3ed34e9240