Merge changes from topic "vintf-manifest-error-logs-part-ii" am: 4c51ebbbe6

Change-Id: Ic6cc30c397dff8f859dbc01f03217d865e4afb33