Prevent crash on boot Bug: 186836335 Signed-off-by: Pat Tjin <pattjin@google.com> Change-Id: If56bdf001181ced1f56c5bcd86a07df65a7ff021
clone from gs101 sha 9d1c97c2 Bug: 183183095 Change-Id: Ie7112bdf0aceb33c9e1956aa52e961b670582733