Updates from latest Moto X source drop

Change-Id: I57bc054806af93d15043f0c5d3e4497c565c367c