Merge "Add Android app RTD type and convenience method."