Merge changes from topic 'revert-ltc-soong'
am: fb05a09a Change-Id: If764bce1a3bcdc8e7ae04b048b14236d6bda4aa7
Loading
am: fb05a09a Change-Id: If764bce1a3bcdc8e7ae04b048b14236d6bda4aa7
mentioned in commit 1550702f
mentioned in commit b8f54976
mentioned in commit 4bfd6866