Merge "Fix SuperNotCalledException. am: 04f8cc2bb3 am: 33a199e241" into nyc-mr1-dev-plus-aosp