Merge commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6' * commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6': ADT Extract String ID: use Context.getString(id) directly,
Merge commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6' * commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6': ADT Extract String ID: use Context.getString(id) directly,