Merge "Merge "(TouchMode Permission) Update shell permission" am: 9d625f5392 am: 74927c2995 am: 952554a16f am: 822f1965c5"