Merge "Add more info to class initialization check" am: d78cecab78 am: f481326670
am: c5c0716cbe

Change-Id: Ida4e2024ffb93bbf5bf39c3e1ef4251f19cc7e34