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

Change-Id: I71b9aac009af507fd7638029292efb8ca3226219