Merge changes from topic 'revert-ltc-soong'
am: fb05a09a48

Change-Id: If764bce1a3bcdc8e7ae04b048b14236d6bda4aa7