Merge "Fix security vulneratibly 31960359 am: dffa078205 am: b8b076e553 am: 46dd3c89e5 am: 04f62d5b99 am: 60d1f5b1ab" into nyc-mr2-dev-plus-aosp