Add backward compatibility for SEHAL am: 70a9077bd1
am: 56897e4787

Change-Id: I9a0c6e7c97fd9d9c4cc31da14de6d995754082a5