Merge "Merge "Various updates and fixes" into nyc-mr1-dev am: bb1bf03a am: b491bbe9 am: 004570a2" into nyc-mr2-dev-plus-aosp