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