Osu: temporarily comment out the usage of deprecated intent definitions am: 06b63dcb am: de91bfd2 am: ff5be641 -s ours Change-Id: I4f8c9b6cf747301facd81450a040a32cd0c94114