Merge "Use TCM context if application context is unavailble." into pi-dev
am: 87631c2d29

Change-Id: I8ec20d2c5815dfffeb60f11c0b8f9490feed5e94