Merge "Merge "Corrected typo in word device" into nyc-mr1-dev am: a294f188 am: aad8d86c am: 126b36ef" into nyc-mr2-dev-plus-aosp