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

Change-Id: I9d41723be9fc9263f9d1e1c152bc9de458cb3478