Merge changes from topic "vintf-manifest-error-logs-part-ii" am: 4c51ebbbe6 am: 6dd0cae03d am: 844f21a614 am: bcaafd9126 am: 295dcb9703

Change-Id: I814a1d871bcfcc8fb8eb5ae9fad28fc710c8d7a2