Automatic translation import

Change-Id: I7c0626fa07d1bdb0f3eda8ff27789588c4b117b7
Disable extra stuff for L bringup

Change-Id: Id796760af686fc5a308d2e35c51a9eeb8de241a6
Merge remote-tracking branch 'cm/cm-12.0' into HEAD