Merge "Add a missing boundary check of mStkContext." am: 11b59edfb4 am: 4085a176f7
am: 211369da35

Change-Id: I4008fd303d90dbad780b9fbb39a963da0010b97c