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

Change-Id: Ie34e6b01c0fe919bd6a5b2c12403f10d43956ff5