Merge \"Merge \\\"Fix more of issue #28689719: Runtime restart\\\" into nyc-dev am: 4781525399 am: a2cb7a0ef3\" into nyc-mr1-dev-plus-aosp
am: f9a8262b03

Change-Id: I4c8233985141ae062317bc540370d9aa74134b74