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

Change-Id: Iff7af695bf555a3e71dabf0205318cb8e1431906